popupMenu: Use .selected class for active item

Currently it uses .active, which matches the code more closely, but
is confusingly close to :active; so .selected it is ...

https://bugzilla.gnome.org/show_bug.cgi?id=745246

diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index aad37772301e332015e784d8d12fb71f907ba247..c2160c262285a02887a399877738fcd8b26cf7de 100644 (file)
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -401,7 +401,7 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(255, 255, 255, 0.5); }
-  .popup-menu .active {
+  .popup-menu .selected {
     background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #fff; }

diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index e7f8bec7ef161e42ad3678aca0b99e13298af7ff..bc0a7a9fcdc32bf79679542dba41a4a6de5615f1 160000 (submodule)
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit e7f8bec7ef161e42ad3678aca0b99e13298af7ff
+Subproject commit bc0a7a9fcdc32bf79679542dba41a4a6de5615f1

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 02672136310dfc69c49b6a942eeb452654ff812e..27088943f8ebbed95f057bd6f61b121ac45d38d5 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -401,7 +401,7 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(238, 238, 236, 0.5); }
-  .popup-menu .active {
+  .popup-menu .selected {
     background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #eeeeec; }

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 72a62bdf358b3d1428337579f3d46f4be084797f..404e68138d476b37a0182b598df00391566cfc7d 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -169,10 +169,10 @@ const PopupBaseMenuItem = new Lang.Class({
         if (activeChanged) {
             this.active = active;
             if (active) {
-                this.actor.add_style_class_name('active');
+                this.actor.add_style_class_name('selected');
                 this.actor.grab_key_focus();
             } else {
-                this.actor.remove_style_class_name('active');
+                this.actor.remove_style_class_name('selected');
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS